Increase test coverage
Cleanup for PEP 8
Add ordereddict to fix for Python 2.6