Improve testsuite

Add more unit test