Clean up salutation mocks, to use random data