Simplified/clarified integration test

+review REVIEW-5208