cleans up test folder
Merge branch 'develop'