Upgrade from vb6 - progress

added in test points