Add unittests

Add more unittests