integration test for #117
Merge pull request #123 from justinhrobbins/feature_117

integration test for #117