Fix tests for config
Fix tests for core