Fix a couple of broken tests, and support `before` commands