Test-fixes
Merge pull request #271 from tmorgner/master

Test-fixes