Merge "Add unittests for remote client"