Enhance polling design with complete test suite