Merge pull request #80 from ollyjshaw/fixing_tests

Fixing tests