Make test and model changes