Update specs to seperate factory validation from validation testing