Update CST.
Fix tests