remove most explict <instance>s for basic modules

and fix test data to reflect sorted order of instances