TS-3006: Regression test fixes. This closes #118