Review action enablement
First refactoring tests