Yet more unittests fix.