Incorporated guard and spork to shorten tests