Clear obsolete TODOs
Replacing ignored (and complex) unit test by simple acceptance test
Better hierarchy for the action extensions
Clear obsolete TODOs