Fix tests for remote driver