Remove dead code
simple has_label matcher
Add more expectation helpers