update tests to reflect changes in #281
Merge branch 'develop' into staging