Close #85 Speed up the spec suite