Fixed 2.5 incompatibility in p4 tests
Fixed p4 poller tests