Feature/factory girl guard cleanup

factories and guard cleanup for testing