Fixing a couple of unittests