Test and Sample Cleanup