add to setup, utils and tests + pep8 fixes