JCLOUDS-458: Addressing suggestions in PR-31

minor changes


I see now. I was confused by the argument matcher, as I've never used it. The tests looks good, so forget about my last comment.