Upgrade thor to 0.19.1 and refactor tests

Upgrades Thor to 0.19.1 and refactors the tests to capture output
from puts as suggested in http://goo.gl/eHtBnl