Update test functions BEFORE tests
Merge remote-tracking branch 'upstream/master' into makefile
Merge pull request #932 from mick-d/makefile

Update test functions BEFORE tests