merge fix for test failures