Add guard and spork fo TDD