test

test: add test around the polling server and fix surfaced issues #1977

Job	Run time
Internal Tests	2m 44s
Controller Tests: Non-numbered	2m 34s
Controller Tests: 10->29 / targeted-test	2m 47s
Controller Tests: 1xx / targeted-test	8m 14s
Controller Tests: 2xx / targeted-test	7m 28s
Controller Tests: 30->59 / targeted-test	5m 11s
Controller Tests: 3xx / targeted-test	3m 15s
Controller Tests: 99xx / targeted-test	5m 12s
Controller Tests: 60->99 / targeted-test	3m 26s
	40m 51s

Provide feedback