Added more unittests
Added more unittests