Update code to latest collapsed towers.

Also fix bug in test_script.sh