small fixes for tests
Merge branch 'master' into sle12