Started working on unittests