Got raptor-optimizer back to normal. Tests passing