Merge "Revert "Add patchoat test""