Add guard, spork and other bits for automatic testing