Reorganized tests to simplify