Reorganized tests accordingly