LPS-37718 Made tests compatible with the new way of dealing with nullable servlet names