Fix up CX1 scripts
Merge branch 'master' of ssh://github.com/nchong/barrier-reasoning-tests