Reorganized test suite