fixed failing tests
Merge pull request #686 from raistlinthewiz/develop

fixed failing tests