Fixed factory and specs [#84276770]