Added some tests for the overridden create_or_update method