Changed the unittests - to reflect the new 'all-token-analyze-all' strategy. but most likely this strategy will be reverted - or used only in some parts; so i am not sure this won't be reverted again. The main changes are that in some cases the optimization doesn't simplify the query - but that is not a big deal, as the semantics remains the same