Moved and renamed ModelTests.java to ModelTest.java
Removed unnecessary change.