Worked with Craig to give his changes semantic names. Also fixed some issues with matching 'FAILURE', 'SUCCESS', and 'SKIPPED'.