Modify how specs are executed to improve execution speed

Would you be alright with merging these changes?