refactored feature tests