Add unit test cases