Model Tests Implemented. Full Refactoring done