SchoolService test -> corrected and cleaned up of tested classes
Cleaned up code