Update test suites with new URI changes

This changes addresses:
   - variables updation with new URI
   - Fix minor spacing exceeding 80 characters

Change-Id: I3fa314f51d0b52e36649f0bfa605a02a3820e875
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
6 files changed