Moved around lists of AP and SAT2 tests