Added a few unittests