change tests to expect id$.

also update elasticsearch module.