Cleanup of Test classes