updates to run tests cleaner
Merge branch 'develop'