Validation and Test

Updated validation and test.  One test is failing