Modification to make test green
Fixed type check warnings