Add Travis build image to README
Cleanup discovery tests
Replace ad-hoc pain with builtin methods