Merge branch 'bw/use-write-script-in-tests'