Merge pull request #11650 from prathamesh-sonpatki/rename

Renamed private methods _create_record and _update_record
Fix the test defining the models in the right place