add factories, features and models spec files
fix merge conflicts
fix merge conflicts
fix merge conflicts