Refactored feature tests