Data model and test updates