Small correction in configs
Remove old files
Merge branch 'master' into test-FAN
New tests added