Update test order to fix weird routes definition issue
Merge branch 'specs'