test cleanup as per comments