Add variable for test and data dir
Add argv
Commentout log output
Split make and test
Add comment
Merge branch 'dev'