Cleaned up the build.xml file a bit more and wrote more unit tests for MainModelTest.java