Fixed validation + tests