Added tests/fixed tests in command.test