Change and merge tests