Update templatetags tests to pass on 3.x and 2.x (Don't rely on implicit orders)
Update templatetags tests to pass on 3.x and 2.x (Don't rely on implicit orders)

khchine5/opal,khchine5/opal,khchine5/opal