Fixed lint errors
Fixed lint errors
Fixed tests