These tests are looking good, but they don't cover the newAPI code path you added. Would you mind adding tests for that too? You could either create two new tests or just have these tests each use both the old and the new API's.