Added Guard and Spork for test automation and performance improvement