Test cleanup with testify
more cleanup