Adding some unittests