Correcting wildcard tests
Improving test for non-trickle