[WIP] Migrate legacy tests (second batch)

Continue #1328