EHO-369 Added integration test for filtering customers. Gave the integration tests some refactor love.