pseudoconstant declaration for financial_type_id missing in some places
spelling & comment fixes
Merge pull request #3408 from eileenmcnaughton/testfixes_and_tidy_ups

Testfixes and tidy ups