Rewrote fake estimator to be more modular; broke closure tests :(