Add corrected factory, tests now pass.