add more tests for issue #22