Removed localToRemote/remoteToLocal and refactored tests