Reorganized test specs