refactoring model names and adding tests