fix broken specs and factories