moving toc from config to service + Test generators