Refactored tests to use localToRemote/remoteToLocal