Reorganized the tests