Add test data and modify the models