Test code clean-up.