Start re-working integration tests