Fix non-working integration test, fix broken strategy