As agreed at standup today (18 Oct), we need to review what is currently failing as tests and fix them so we can get passing PRs.