Refactoring unit tests to apply a fluent builder pattern to commandBuilder
Updating tasks to use the fluent builder pattern