Fix check/radio validation, add tests