Merge test helpers into vp-devel