More sensible default ordering
Make tests match action texts exactly
This might break some tests