Reorganized tests