little clean-up for test classes