Fixing some issues while testing client with the federator