Test fixes and clean-ups.