Remove unneeded method, reorder parameters to better match similar commands, and add missing tests for command generation, as per code review on pull request