Updated test coverage and refactored existing models