Merge "Add two table parser tests"