Much work on testing scripts
Updates to test scripts