Minor nits

Nice library, here's some minor style changes and a fix to ensure the tests cleanup even on failure.