Fix a broken test
Add an e2e test
Factor out pretty printing of blockers

Still needs tests