WL-3014 Include test fixes for API changes.

Missed the test fixes the first time around.