Determine which of two modules gets moved

Also, rename all modules in test lists so that they read in a more
natural order.