Slight refactoring of our tests framework.