Added unittests (failing)