Merge "Remove usage of setDefaultImpl in test"