Fixed broken tests.
Merge branch 'master' of ssh://github.com/JulianKunkel/siox