Reorganized tests some more