Fix EntityPollingTest

- and tidy JmxFeedTest, to not use deprecated method