Adding additional tests to cover issue #79