Reorganized the tests into Functional, Advanced, & Customer categories