More robust filtering of results.
Fix BA test.