Cleaned up some stuff. Updated model exposed by test service.