Adding feature tests