Test 'abort' also when not mocked
Fix queued test: the message is different on the first run
Minor cleanup to 'kill flow'