TS-2632 Fixes to check the new configs properly