fix issue #17: Refactor test cases