Fixed tests and made EvenlyDistributedTopology a bit more efficient