Minor change to conform to spec, updated tests