Migrate legacy tests to new suite + more test fixes.