Make flat tests safer.
Fix filter test stream var names.