fixed failing tests
Merge pull request #1 from woodgoblin/master

Failing tests have been fixed