refactored feature tests --Ravi