minor testdata tidying
renamed all modules