Removed what remained from DynamicResourceKeys namespace & updated usages & added a missing test case.