CDI-18 Decorator enablement and ordering
- update assertions and tests