joachimmetz Changes for CI tests