merge fix for tests