Add guard and spork for better testing