Merging test changes