deleted 'test' folder
Some cosmetic changes
small tests refactoring
used FactoryGirl for tests
Merge pull request #2 from ColinMcRae/dev2

Dev2