Fixing merging problems with tests