Merge "Add unit tests for commands"