Organize tests
Work on organization and tests