minor refactoring of feature tests --Ravi