Some more test clean up.