Merge "Adding unit test for makeRemoteTransition" into main