fix broken test project
Merge branch 'master' into reconfigure
config parser for updated format