Fix #211: Update Gonzales and add tests