Fix last two test failures... fingers crossed that this is it!