Merge from HEAD - get the test the right way around, so that we can change