civicrm-upgrade-test - Misc fixes