fixes failing integration tests, again, pls review