Refactoring and testing of RemoteServerList