Chores/new factories and specs