Potential fix for github issue #213
Merge pull request #214 from rlandy/retirement_tests

Potential fix for github issue #213