Better unit test support