Tidy up integration test a little
Overdue needs pause