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