Fix unittests broken by revision 360.