Add unit tests for MakeCommand

Fixes #131