Add Guard and Spork, update testing