Fixing smoke tests i.e. recovering from the aftermath effects of #1114