Merge "Add patchoat test"