Update Test and TestDev

Update Test and TestDev to support the new Wave v0.50+