Note: the ordering is important here *for the tests* - Mike is going to raise a bug as it's not a blocker for this piece of work but we need to address it or document it.