Consolidate tests, rename validate_value