Merge "Fix failing test"