JCLOUDS-458: Addressing suggestions in PR-31

minor changes


Should this be inside an `expect` statement?