added remaining unittests