IDE-1602 fixed unit tests