Slight change in wording of test results.
Move internal use macros below external ones.