Cleanup Of some Tests