More tests for bug#1979
Merge pull request #8 from BrianHawley/bug_1979

More tests for bug#1979