Edits to test scripts
Working on cql