Cleaned up test code.
More test cleanup.