Rewriting factory tests considering the newly introduced dependencies