Fixed validation & tests