Clean up test names and demo scripts