Fixed tests. Tidied up readme
Properly fixed tests
Refactoring
Merge pull request #36 from hollandben/fix-tests

Fix tests