Fixes
Merge pull request #2 from waterfield/feature/fix_tests

Fixes