Add Petey's tests