Add tests, add models, changed modules