unify and correct assert order
more corrections in order
Merge pull request #2638 from dereuromark/2.5-assert

2.5 assert