Fix tests after b8e73d1cb09
Merge branch thehyve/master into transmart/master