text fixes
Merge pull request #1483 from kurund/text-fixes

CRM test fixes
more test fixes
Merge pull request #1484 from kurund/text-fixes

more test fixes
indentation fixes
Merge pull request #1489 from kurund/whitespace-fixes

indentation fixes