Improve pmap
Run tests on 17.1