combine tests to deal with loading only happening once

Signed-off-by: Chris Boertien <chris@aktionlab.com>
add factory girl syntax to rspec when its loaded

Signed-off-by: Chris Boertien <chris@aktionlab.com>
update factory girl minor version

Signed-off-by: Chris Boertien <chris@aktionlab.com>