Fix the unittests to compile too.