Cleanup test delivery methods