Try to fix the problem in tag filtering reported by Tyler. re #125
Organize a little the test to avoid timing bugs.