Improve test suite, clean up leftover .sock files
#301
+55
−8
.sock files
#301