Fix tombstone Add e2e to verify equivalence cache Addressing nits in factory,go and e2e Update build files