Simplified factories and updated specs