Merge "Refactor BiDiTest unit tests app"