Making old test scripts working.