Re #469, this fixes the unit tests for the new format
Unused imports
pep8
Doc updates