MCI fix, unit tests
Broke local repo fix