Fix integration tests when a test has more than on data/expect section and deprecations

Fix integration tests when a test has more than on data/expect section and deprecations #1669