Refactored tests to include factory girl