Standardised header comments in unit test units.
Reintegrated v4-dev branch into trunk. Trunk now contains v4 development tree