Simplified default config to context mapping and fixed test case.