#1042 more unittests