added/fixed some more unittests