Added tester for one record ,and some cleanup. Found error in ES
matching: to be fixed