restored a couple of unittests