Fix feature tests