Improved polling fairness so slow triggers can't stack up, fixed unit tests so they actually run against the new moved around files