Remove usage of InAnyRecentEra in tests + extra simplifications
#7123
| Job | Run time |
|---|---|
| 30s | |
| 30s |
InAnyRecentEra in tests + extra simplifications
#7123
| Job | Run time |
|---|---|
| 30s | |
| 30s |