fixes, unittests