Changes to make integration tests work for MB