Add feature tests