According to MR suggestions, fixing tests
to account for the new polling actions. Also
removed some extra code that wasn't being
used.