Updated test files and test_scripts.py

from #435