Getting tests to run (a little bit closer)

I wanted to run some tests and found a few things broken. I've fixed a couple which gets the test run a little further.
Though it still dies on the undefined `hit` fn.