changed more unittests