Adding more tests and gossip count