fixed ts tests for ext
Merge remote-tracking branch 'origin/refactor/mps312' into refactor/mps312