issue #12: change test method names
Merge branch 'issue-12' into issue-13