Reorganized tests structure