mend
various fixes to broken tests
Merge branch 'master' of https://github.com/robindevilliers/cascade