Chore/specs and factories