Added unittests