Some enhancements for the tests.