More test reference clean-up.