Fix failing tests. And speed up RDS.