Updated specs and refactored factories