Fixing failing tests in t6038.