Reorganized the tests onto files