Adding James Kunze's tests