Expand tests to verify advertise count.
Add a couple more unit tests for RibOut keys.