Tidying up the MockRunner

Using it within Sipity, so I'm encountering minor differences.