Merge "Update BiDiTests app"