Fix tests that new content api client broke
Merge remote-tracking branch 'origin/master'