BZ-13096: Test changes