Refactored some models via TDD.