Changed polling structure for testing and fringe cases