Working on test scripts