Fix EntityPollingTest

- and tidy JmxFeedTest, to not use deprecated method
Merge pull request #863 from aledsage/fix/EntityPollingTest

Fix EntityPollingTest