Merge "Add tests for compatible property (1/2)"