GS-11239 Test refactoring
GS-11239 Fix indentations
Merge pull request #7 from CloudifySource/GS-11239-gsm-two-failures

Gs 11239 Refactoring based on CR comments