added a few additional cursory tests
Merge remote-tracking branch 'origin/ds-917' into ds-917