Small Changes

Changes to test scripts..