added more unittests