Add spork and guard for testing