Add to external shuffle client and add unit test