Get tests working for builds against v2 api