ticket:3 check ordering in tests
Merge branch 't3' into t4
Merge branch 't4' into t6