[dev] Fixed remaining test regressions.