Fix remote tests