Fix spring-integration4 tests

This change fixes integration4 code so that tests pass.