Clean up test site
More clean up