Ellie is fixing these up in her integration testing bug fixes.