Splitting tests
Reorganizing tests