Add guard
Add spork to speed up tests