Fix pytest and lint errors
5 files changed