Merging extra pylint tests into master