PM: stabilise tests with and without coverage whilst not breaking the demo page.