Additional test for enrich instruction
Groovy instruction refactoring and tests