Updated models, added testing data schema