PRs ready for review _

Two migrations to runTest (attached with other improvements):