Updated tests
Added validation tests