Fixed unit tests for UIS and MCS