Cleanup and more test results