clean up the gillespie test a bit