fixed bugs found in writing the tenant mode tests SS-453
Merge pull request #86 from harsha89/SS-453

fixed bugs found in writing the tenant mode tests SS-453