Reorganized tests
Reorganized testing