Modified Internal and External Test Scripts