test.h should always be included first.
Merge pull request #1792 from jimis/master

test.h should always be included first.