Merge pull request #381 from euanh/spec-wrapper

Fix pylint warnings in tests