Merges test changes.