Test regression fixes

All caused due to renames