TS and Tests update