AMBARI-6623. Fix unit tests that are broken after AMBARI-6533 (Alejandro Fernandez via smohanty)