Modified test scripts to accomodate changes otherwise made