added validation tests and passed them
fixed merge conflicts