Upgraded Test Scripts