Adding testify
rem feature_test
Merge branch 'feature/testify' into develop