Adding unittests