Update to latest make-a-wish and add tests