Make tests automatically discoverable
Improve code separation to be able to write commands tests