Fix tests
Merge pull request #703 from yemel/fix/tests

Fix tests