more tests, organizing models