Refactored test scenario terms