Changed name of unit test for model.
Changed naming conventions for classes for clarity.