Merge pull request #242 from andrerod/dev

#240: Tests on cli leave it with 'dirty' state
Merge pull request #244 from andrerod/dev

Making UT faster and more reliable
Merge pull request #247 from andrerod/dev

Fix json and verbose options
Adding terse and padlevels change
Merge remote-tracking branch 'upstream/dev' into dev