#32 more unittests