Fix couple of unittests