Updated school tests to work with new project structure