Add Guard and Spork for better testing