Small test clean-up