Consistent deps order in test and all modules

Globals firsts, than local modules