Merge test changes