Merge "Update inheritance test implementation."