Reorganized some test classes