Fixes to make sure quicktest.sh tests ran successfully