- Fixed unit test.
- Added tests to verify that '<id> <command>' and '<command> <id>' both work as expected.