Changed things in ModelTest, Should not have names of us in comments,
only should be at top. Also changed how the XML test was performed
because some of it was off.