Fix the test so it's correct.
Merge