Many changes to the TS-SCAN logic test 1