Fixing KPV and KTI tests.