Merge "Revert "Revert "Add test for proxy methods on default methods."""