add first validate tests
fix conditional statement
fix conditional statement