TST-02 issues fixed