Tidied up setting of expectations in integration test