ARQ-1543 Fixed class and method shadowing in TestEnricher