Many changes to the models and test data