pep 8
add in some tests (bug 858194)