1231: Testing2

Tracking branch at https://code.loganite.ca/greg/scratch/-/tree/t/1231-testing2 Upstream issue is https://github.com/test/issues/1231