EST-416: completing tidy-up of existing integration tests

... only ones that are still untidy are the integscenarios (have some @Ignored tests in them).