WAPS adjusts for 22E6, 22E5 testing cycles