Refactor elastic tests
Fixed build
Error with inheritance and mapping...