CRM-13072 more test class upgrades
CRM-13072 tidy up of examples, syntax conformance debug