Fixing broken unit tests

EUCA-9930