Add validation to flag.
Add/fix spec
Merge branch 'fix-flag-validation'