Cleanup tests.
Add additional stats