Add support for `--restore-session` to work with automatically generated tests

[mirenradia]

Currently --restore-session does not work with automatically generated tests (e.g. those created by using the --repeat, --distribute or --parameterize flags).

Following comments under #3072, this issue is a feature request to add support for this capability.