Added multiple unittests