Refactoring testing patterns.  See upcoming email.  Feature tests will have to be updated.