Test data clean-up.
Test data clean-up (continued).