Adding the modelview test and some changes