Refactored all tests to use Factory methods