Merge "Update BiDiTest app for adding more unit tests"