Final fix for model specs, after removing unneeded factory