add snapshot deletion logic back to tearDown
Merge branch 'health_checks' into build