Add a test for the fixes on this branch.