Refactoring remaining unit tests to use fluent builder
Updating tasks to pass unit tests