Add guard and spork to improve TDD