Update tests so as not to talk directly to Content API