Some updates for testify

psr-4, update syntax, fix a bug, clean the code.