Factory test fixes