add tests, add new models