Fix and improve bgp_server_test

Change-Id: I92014d563335137a242ca78cdfb40a1dda5da9db
Merge "Fix and improve bgp_server_test"