Fixed tests and general use with the new VPainter logic