Fix tests and add school