test from petch
fixed conflicts
petch test