Tweaks to make API test work