Cleans up Model and ModelTest