bug fixes, changes to tests in response to new aborting policy.  Passes all but one upgrade test