fixed test merge