Added a few more validation cases