Reworked test scripts