Merge pull request #139 from zas/deprecated_unittest_aliases

Replace deprecated unittest aliases
pep8 fixes