Added FixtureFactory Dependency and Tests Refactoring