Attempt to fix apply_remote unit test