delete unitTest directory
Merge branch 'master' into dev