Refactoring to allow injection of WorkflowTask
Simplify test
Remove unused setup AWS facade code
Tidy up white space