Added support for v5.0 testing