Test unify enhancement fixes

Test unify enhancement fixes