CONTRIB-3782 Work on updating unit test code, more changes to the upgrade script and starting to write the reset script.