Add test and extend Validation