* Both test now compliant with new API