Fix unittests for 3.1rc
Merge pull request #25 from stojg/fix-tests-for-31

Fix unittests for 3.1rc