Refactor shared validator, bulk update samples doesn't use it
refactoring specs in progress