Reducing Test Setup Complexity

Apply builder and factory patterns within tests to streamline arrangement.