Re #9958. Fixed to the unit test. Temporarily disabled a test.