More tests; cleanup in goroutines.