Fixing merging problems in tests