Fix some issues with the deprecated Factory Girl methods
Fix user factory and renamed integration folder to features