Merge "Update BiDiTest app"