Merge "Fix failing test."