Reorganized the tests and their configurations