Build #1886:   fix types on branch feature/add-tests over 7 years ago