ISSUE=8047 fixing unit tests