Add variants command tests
Refactoring command tests