Tests pass here, +1 for squash/merge