Fixed config, added some tests to it
Optimized EntityRegistry validation