Unit tests fixes
Fixes for missing KPV params (test is still failing)