Moved to using the constants for all references to the folder / task name

This is with the idea of making the test folder / task name configurable so the folder eventually doesn't have to be called 'test'.