code cleanup model and test runner, refactor the expectations unit test