Fixed failing integration tests caused by changes introduced in 8134ecf5b7058e03c56a0dc2f1857617e6e0ee09