add new tests for issue #54, issue #55