fixes for some integration tests in BaseIT