Rev 17-5-3

Adjust the test sequence for test groups O, Q, R, S, and T