Some test clean-up.