Replace data provider logic by similar separated tests
Annotations added for variables
Command description changed
Rename command and fix related tests