Fixed spec error found by the new validator
Fixed error reporting
Better validator; added more tests