Reorganized the tests to be more consistent with the organization of the modules they are testing.