Some quick test cleanup.