Fixed test scripts
Fixed config scripts