Cleaning up unusued stuff in tests