rebase and fix

Rebase and fix for ST and MCI tests