fix failing feature tests