Added more unittests