Revert "Revert "Fix setUpWithRecord (as per cloneRecord_test)""

This reverts commit 21e2f43d108e90e06782a34a0f05f7a53471360a.
Revert "Fix a test in User.test.js"

This reverts commit 9bd02c7eb9f7f72ed65a3e3e9edda7f2811820f0.