Fix issue #16 update test cases