new config structure
new config structure
controller tests