fixes: unittests