updating models and templates and test files