Added conditional flag for testify
Merge pull request #272 from astephen2/alexstep_unitest_flag

Added conditional flag for testify