Merge "Rewrite compatibility checking in unit test."