Some updates for testify !