Small refactoring
Joining RemoteActor test fix