Fixing tests that seem to have been broken by the PollingCommand refactor