Added factory girl helper method for rspec tests and refactoredtests to ...

...use helper