add more validation tests
cleanup