Merge "Update BiDi unit tests"