Add Guard & Spork testing features