Continued adding unittests