Added some unittests