Ver++ and small monkeypatches in tests