Address test failures