Fixes a couple of test failures