Add guard and spork for testing