Added some more unit tests and pep 8 fixes.