Cleaning up test code.
43 files changed