virtpatmat fixes and tests collected from topic-virt-patmat-2.10.0