Add tests to bolster regressions