Added a couple of unittests (still failing)