Fix the tests

@liveh2o @localshred 
I didn't add this so I can't confirm that removing is the correct behavior. @liveh2o? If we need an explicit return could it be moved up into an `ensure` block in the `start` method?