Upgraded test suite scripts