Add some unit test to increase coverage