[master 1/1] Multiple Dogtail tests improvements