Updated test environment: Gaurd and Spork