JCLOUDS-528

few formatting and space issues

and suggested change for simpler tests.