Fix api and config tests