Swap order of test modules

Change-Id: I7c668683aefc84aac88f357db01513007eeccbdc