Adjust incorrect comment
Further clean up the tests
Add Peers() convenience function and test