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