fix test failures with latest CXF