Fixed failed refactoring
Fixed failed refactoring
Moar command tests