Improve Test Arrangements With Factory ClassesΒΆ