Improve skip for unit test or pep8