Reorganizing unit tests
Finished most of Level refactoring