Reorganized the tests project #2.