Both for _identity_criterion and _range_criterion

Add tests showing direct criteria specification in predicate scripts

And rule tests to match on simulation movements, since this is what rules match
most of the time.