Updates to test cases to build elastic search mappings properly