Fixed/working test script, converting to suite