Regenerated school example with latest generator - proposed test fixes