Fix specs, add validation