Test corrections, and some refactoring, and an additional canary.