change test function includes to use one convention
37 files changed