Playing with merges, tests fail