Reorganized tests slightly