Pass fishtest_dir in as argument
Merge remote-tracking branch 'origin/master'