Minor test clean-up