Fixing broken poll tests