Some refactoring to get rid of magic text
Validate for test variation options