Fix copy
Fix conflicts
Clean up model tests