Fix factory definitons
Fix factories
Fix added spec setup