ISSUE=8335 fixing unit tests

fixing some unit tests