Merge "Revert "Revert "Add patchoat test"""