Fixing remote tests