Merge "fix crashing test due to format mismatch."