Fix issue #22 remove test cases