Housecleaning tests to match, as well.