Fix some lint errors in the unit tests