Delete old test dir
Merge branch 'feature-test' into develop