matt852

Please assign this issue to me. I'm working on a PR for it.

I'm seeing a bunch of test fixes in PR #788. I'm going to rebase my changes onto that branch, or wait until it is merged into `develop` before continuing to...