Beefed up the integration tests