Split the tests in several classes.
Add the merge of commands and their categories