Organize tests
Fix