Converted some of the tests to builder pattern.