Clean up tests
Merge branch 'master' of github.com:kalmanb/remote-peer-dev