UC30 - unit tests fixed errors