Set back to normal Script mode, bug fix in tests