Add Guard and Spork for TDD