Initial tests cleanup
Merge pull request #841 from twokul/command-tests

Initial tests cleanup