Oops - fixed some tests and pep8 errors