Fixed a bug where record instances become out of sync.
Saved a couple lines and updated the unit test