Fix and update for derivative tool test
Merge branch 'master' of ssh://git@github.com/DawnScience/dawn-test.git