Additional unittests