* Migrate User.Save to Sync by default * Make error testing more explicit * Factor out else * Fix some merge-related bugs * Add some missing nil err test requirements * Improve function signature * Remove unused time import * More test fixups