Fix the skipped tests (bug 1050754)
Merge pull request #343 from magopian/1050754-fix-skipped-tests

Fix the skipped tests (bug 1050754)