Add more test coverage for Command