Update to work in latest sdk
Updates to match latest unittest changes