Fix failing tests after idiomatic improvements