Fix failing integration tests due to ambiguous id