Test fixups and correction for #317
Merge pull request #298 from mballance-sf/master

Test fixups and correction for #317