Commands: Fixed unit tests