Make test more robust

This will help figure out what is wrong in the merge conflict in another
branch.