fixed various broken things with simpledata
fixed tests for schools
Merge pull request #518 from unikent/bugs/fix-broken-simpledata

fixed various broken things with simpledata