adjusted for pep8 and made improvements ot the unittesting file
.