Add tests
Merge branch 'canary'