[HW]        -- refactored data module tests so that each test is somewhat smaller