JCLOUDS-653: correct mock expectation
JCLOUDS-622: Remove last vestiges of InputSupplier

Guava 16 deprecated InputSupplier and a future release will remove it.