Filling in more gaps and test coverage with standalone executable
Merge pull request #329 from meatballhat/standalone-executable-touchup

Filling in more gaps and test coverage with standalone executable