anchor matches in defines and tests (and remove toothpicks)

This should help solve #16