Changed testing script, changed data extraction dynamic