Modification for feature tests