Fixes test failures