Controller config + tests added