re-wrote spurt tests, DRY