Only ensure model data exists if we have a schema
Remove worthless put statements
Fix tests