Better factored specs

Better factored specs