Improved validator spec