get rid of the models package
refactor tests... again
more work on test refactoring
explicit lock errors
main invariant initialisation sequence