Refactor, reduce output during integration test