Moved test cases around a bit.
Merge branch 'master' of github.com:armet/python-armet