WL-3014 Include test fixes for API changes.
Merge pull request #53 from ox-it/WL-3014

WL-3014 Include test fixes for API changes.