adding to and fixing tests
removed accidental commenting out of test
uncomment
code cleaning etc
i can't remember what i've done
returned the Gemfile.lock
Merge pull request #15 from cboursnell/master

Adding tests and fixing errors