Working on unittests