Make unit test cover all cases