Clean; normalize; and, reduce duplication with the test suite.
Merge branch 'master' of github.com:armet/python-armet