fix factory girl deprecations
fix some deprecations and renamed some files
fixed text