Fix unit tests after r9935524