Fixing remaing remote tests