Add test for returning school id
Add a test for returning the school type.
Merge remote-tracking branch 'origin/master'