Updated factory
Merge branch 'fix-cucumber'