Fix up all current unit tests to match the changes made in this release