Add spork and Guard for testing